Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

run-queue: Extend queue capability check to job-runner #6080

Merged
merged 1 commit into from
Mar 13, 2024

Conversation

martinpitt
Copy link
Member

@martinpitt martinpitt commented Mar 13, 2024

With job-runner, the bits that actually need /dev/kvm don't run in the "queue monitor" task container any more, but in separate containers. We want to drop importing /dev/kvm into the monitor container [1], so extend the check to also accept the presence of a job-runner configuration.

With that we can drop the check for COCKPIT_TESTMAP_INJECT -- that was just a hack, and the cockpituous integration tests define JOB_RUNNER_CONFIG already.

[1] cockpit-project/cockpituous#590


Tests are blocked on cockpit-project/cockpituous#590 , as currently they use the cockpituous/main tests with the refreshed tasks container from that PR.

With job-runner, the bits that actually need /dev/kvm don't run in the
"queue monitor" task container any more, but in separate containers.
We want to drop importing /dev/kvm into the monitor container [1], so
extend the check to also accept the presence of a job-runner
configuration.

With that we can drop the check for `COCKPIT_TESTMAP_INJECT` -- that was
just a hack, and the cockpituous integration tests define
`JOB_RUNNER_CONFIG` already.

[1] cockpit-project/cockpituous#590
@allisonkarlitskaya
Copy link
Member

I reran the job now that we landed the cockpituous changes.

Copy link
Member

@allisonkarlitskaya allisonkarlitskaya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the bots like it, then so do I!

@allisonkarlitskaya allisonkarlitskaya merged commit a9b41af into main Mar 13, 2024
6 checks passed
@allisonkarlitskaya allisonkarlitskaya deleted the kvm-test branch March 13, 2024 12:20
martinpitt added a commit to cockpit-project/cockpituous that referenced this pull request Mar 13, 2024
With the run-queue fix [1] landed, we don't need this as indicator for
"capable of running tests" any more.

cockpit-project/bots#6080
allisonkarlitskaya pushed a commit to cockpit-project/cockpituous that referenced this pull request Mar 13, 2024
With the run-queue fix [1] landed, we don't need this as indicator for
"capable of running tests" any more.

cockpit-project/bots#6080
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants